Latest changes for pointer event stuff. Still WIP