Adding full single-user functionality.