working through some more tests and fixing bugs along the way