Improve Drawing Algorithm

[AarCon]

The current implementation of drawing relies on a function that doesn't give O(1) lookups. Denmark has an idea of how to fix this and can be found here