Update 0.6.2

+ Slowly making progress