WIP Initial work to move the resovler in