Fix memoization macro, and stuff
did... things. (more tests, other stuff)