WIP: Improved approach, 6 tests failing.