Added write in fields on client side
Changes
Fixed merge conflicts, added write-in