Not there yet

Made progress, changing to Enum next