Finished first draft of servlets and entities