New canvas WIP
manually merging