Added some brush stuff

All new stuff needs to be tested.  Also see all the need-to-do's on the
previous commit.