Updated with some account handling logic.
Still need to clean up the experience.