Implemented POI tokens. Refactored some other bits to make them a bit better. Closes #29