WIP for review

This has a bunch of ideas I'll document inline