TODO 2 done

Concerned about basisPts and uScale, vScale