latest changes, working on the graphics portion