Pull Request for Issue620

Old code! Yeah. I just didn't have the energy to fix this or the AMFirstTimeWidget.h file (into a .cpp file too). Oy.