Alt Building Branch. Need to rethink class names for 'Types" and enums