got framework for all code, just lots of testing left