[WIP] Reorganizing Frames

This commit fixes some of the design issues with the Frames classes