Apparently I was not done with this yet.

Now, new and improved, with Frame!