Huge simplification of things (movement across screen buggy though)