refactored into having Frames, WIP
Factory almost finished, FrameTest separated, general refactor