Fixes dependency issues

Adds the resolve context modifications

Adds back the Stack (discussion needed)