commented everything on the client, except the views