Added users and fun stuff