resolution stuff, still some rearrangement