Implemented more of the drawing methods, game now runs in several threads
resolved conflicts