Working on cleaning up graphics code. Movement still really buggy