Nearly finished step 2. Validations ok. Started implementation of update to server.