Implemented conditions
removed unneeded TODO
made map more fun :)
updated TODOs