Adding users as been added. Tweaks will be made in future commit.