Updates to user functionality -- WIP