Worked on frame of fun
Merge commit, fixed conflicts