v0.2

Re-write of code base to follow proper syntax.