Controller implemented
Updated server
Few changes due to meeting