Move type substitutions out of Env
Flatten Env
More seperation
Move stuff around. Remove solved Base constraints