Started work on all classes

Still some things missing within