wip-Development

working on tests next
i originally had these three statements as part of one function but that didn't go well with what we were saying about making sure a function does one thing. something doesn't look right about it  now though so i'm wondering if you think i should've kept these lines, 324-329, as part of one function.