Tests passing, memoization safe, etc