TODO fix SurroundWith + unsorted classObjectType