finally, got a decent amount of the tests & stuff in place