Lab 2 Release 0.99

Fully working to spec. Some code cleanup required.