Added code to dispose of the controllers when swapping them
wip