#36 cleanup
#36 moved resolve to Widget