Working on redoing error popup, comented out a bunch of stuff