Add initial functionality for single-user