few changes, still a work in progress... Mainly switched from vectors to maps, dumb not to start with maps to be honest. Also removed unnecessary variables in somes classes and unused includes