fixed a lot of the non-functional stuff, added simple functions to do things

map tests work, shuffle works etc