Replaced HashMap with LinkedHashMap, that makes it prettier
Moved objects around, makint it EVEN PRETTIER!!!!
Merge pull request #3 from tobold/master

Moved shit around