Added some promise messing around