Cut drawing time from 3 seconds to under 100 milliseconds. I am a terrible programmer when I'm in a rush.
Additional optimization that I passed up on accident
Merge branch 'issues/16'