Restructuring of FrameHandler
merged
added my FrameHandler stuff back in