WIP: upgrading to the new pointless; moving ops around