refactor

Removing the searchFrames craziness, adding FrameContext