More work on brush base code