Big restructure and beginning to move canvas text to html