Simplifying to focus on the important stuff.
Adding a warning, this thing is not fully baked yet.
A bit more cleanup and some comments.