Can edit names now!  Also tried to organize things and make the code look cleaner