Okay, this is looking good.

And it is sadly broken.

Going to experiment with branching and merging now. Should be fun. Back to master soon.
In the midst of it.
This approach works.

Merge time.
Fixed bug with NSIndexPath
Fixed static table view bug

Now it’s merge time.