now in testable state (ie. compiles)

20 minutes playtested