moving to ps4, more abstraction, general clean up