Finished Map delcarations

Ready to develop