Working on fixing the way promises work