Bug65 frame rework

Fixes #65

I still have to write the tests, but Philip wanted to start with the merging since this change will break a lot of other tests. So I'm doing the pull request now.