More early work

Working towards finishing UI to be flexible

Canon PSO and Constriction PSO implemented