Milestone

This PR covers everything from the Independent User Experience Flow milestone from the oscurrency/oscurrency repo.