messed up subtyping
corrected subtype colours survial
end of day commit