Changes to .java files, added more xml files (and started from scratch the others),
still doing the intents and fixing the map