Apparently fixed the ghost promise issue... don't use .then() with  promises