Added servlets and initial logic