Finalized code (hopefully); annotations etc sorted out.
Deleted stuff.
Problem 3, but not very good. Meh.