Partial work on the new entity brush system. Temp check in as i change computers.