0.2.0.0

Basically, merging 0-1-0 and 0-2-0 together to simplify the matter