Broke up code

Will continue breaking up code between dialog and streams
Refactored with FrameBuffer
Preparing for merge