Still in rough, but integrated more of @callahad's copy