Add broken frames
Revert to bad design
Merge everything into very broken classes