This is going to create a merge conflict with my map implementation