WIP - adding in turning logic