Finished off basic classes

Finished off basic classes