v
v. 0.1.2

More changes to classes; clean-up.