Fixed all type issues. Now need to create a Resolver