Added final functions
Added user entry and checks