Finished moving everyhing into Master servlet and postcontroller