change: discovered power of enums which led to a rewrite