this should help keep things in one place