Finished?
Provisionally finished, just want to check (lack of) class structure