Lots of refactoring, and recajiggering. Added points and kept track of awarded/spent. Closes #65.