resolver partitially implemented, closed #3, fixed connection