More hacks to get basic point adding and removing working