Move Promise thingy to base class