A method that combines the oil retorting process (or other process needed to obtain/extract heavy oil or bitumen) with the process for upgrading these materials using sodium or other alkali metals. Specifically, the shale gas or other gases that are obtained from the retorting/extraction process may be introduced into the upgrading reactor and used to upgrade the oil feedstock. Also, the solid materials obtained from the reactor may be used as a fuel source, thereby providing the heat necessary for the retorting/extraction process. Other forms of integration are also disclosed.