Adds first draft of point-based closure. Still needs to be integrated and tested