moved all resolver helpers into one place