Still something to do for the new gui