Update 0.3

Added most of the other class