-Initial import from previous projects
-Map Class isn't working yet
-Fixed Header names and duplicate code
Merge origin/master