Major rework to get sprites working