Initial work on promise-ifying algorithm, new UI updates