Stage 2 - Added usermenu