6 move drawings

Merge feature branch. Fixes #6.