WIP - added Y shifting