Handle resolution scopes

@titanous 
Does this need to be moved up a level?