Updated some of the code, slowly getting towards drawing working correctly.