added some shit, modified idmap
Merge branch 'master' of https://github.com/Maromarius/387A2.git
commit and push take 2 for idmap