Updated controller and started work on modules