Tidying up, promisified, added more data