this feels like it should go in a separate commit