Added more functionality to PointCalc, should be working after testing is complete