Fixed double name bug, made further progress