A small step towards using loveframes, and #16

Did #16