Develop - All but resolver is implemented and tested