Making #129 less hacky and more LoveFrames style