Major updates

All parts working except for containsNoConsecutiveTypes()