Clean up for new "monadic" approach
First concept - looking good!
Added canvas and object list functionality