the beginnings of a new structure
merged master
removing old unrenamed class
some basic framework work
merge
title change
some lazyass doccing