Forked a new branch for graphics, working on test