City finalizing deal with Edgemoor to build new terminal