Finished resolvers, adding assignments and debugging