Tiny tiny optimization
Faster hash function
First stab at map refactoring (compile)
Working refactorization