Undoing the pattern of having *Base classes (was to meet the 50 line limit)