Done for today. Added user saving