Previous modifications to make points.py work.  Merge with Ollys changes.