Adding promises, removing httpjs proxy & adding majaX proxy