[Sprint 50] save canvas
[Sprint 50] conflicts
[Sprint 50] Some tiny things in bo