Added phase space plot
Moved some features to controller