Updated to support world and keyboard controls.