hhurray! on to fixing up the framework now :D