Some repackaging and a new GuiHandler