Should be able to get rid of the `partial` now.