Refactor and added test
Refactor and preventing simultaneous drawing
Images are now stored between sessions