First commit
About to change everything
Everything works. About to merge
map population moved to components.h