Commiting before refactoring
Revamped maps code