Continuing work on point calculating