Added user management (still buggy)