Just about done implementing map into separate class