first attempt at GUI + mods to several classes