Updates to bring the stokes driver to the table