cleaned up src, continued adding to framework

Will test a compilation. Not expecting it to work.