Minor changes
Breaking up memoization a bit more
Updated TODO
Merge branch 'continuations'