Update Controller.java

Update #1
Fixed bug with no multiclient work support
Need a couple of tests