start on canvas
renam
general updates
major cleanup