before canvas drawing change
latest changes after changing over to canvas drawing.
some mroe new files I missed.