saving changes for now, see failing test for current status
seems to actually be working holy shit
a few more tests