A huge update...

Matcher half-completed, but painter was mostly done. Also a bunch of more changes I can't remember now...