finish implementing basic map/enum