wip-Development

working on tests next
ya, that doesn't make sense now that i'm looking at it. will move things around.