Commit chnges that work before factoring out a Frame class.