More work on primitives and brushes