Un Hard-coding resolvers

Closes #14