Almost done just need the GUI