Resolver Stuff :)

Hope everything is in order.