Worked on Painter a little, can now be merged