Squashed commit of the following:
Working on handling controls server-side