added basic user and match handling