Andres map functionality
Merge branch 'techMeeting6-10' of https://github.com/InebriatedSquirrel/Seagulls into techMeeting6-10