Version 1

Only the servlet part