Refactored drawing to put it all in one loop.