Adding and removing points now not buggy, but not yet decided on intended behaviour