Adjustments to work with the controller
minor logic fixes
likely that testing will occur locally