Tried to add drawing components
Revert 361ea0a..f8b68ba

This rolls back to commit 361ea0a39e62cded47a636399d6c54725ad988c4.