Conforming to new poi interface
Started breaking the server down.
Work work work. I'm too tired to comment.
Nothing to say
Merge pull request #1 from tgreener/model_changes

Model changes