Lump refactoring :)

Underscore, promises, lots of chaining...