Points methods implemented

Merging in points branch