Change the arch to a framework. Refactoring still needs to be done. 
Problem in the future in creating a new map value because it is using a
enum as a key (enums are static -> look in the framework to view the
object call indicesMap)