Nicki's GUI merged with the rest of the code