Can be addressed separately, but this introduces some deprecations we'll have to deal with.