Added splitting based on the controller and changed quite a bit to fit everything in nicely.