Shaun Martin

alright, i've dealt with the conflicts and updated the tests. should be good to go. @amazreech