Working code, all set in classes

Still to do, make initialize methods for all (in progress)