Update 3

Combine two classes. 
Testing..