Continued Edwards work on (|-)
Added empty and one object categories