Rough implementation of points system. Some cleanup from old points system. Removed unneeded test comments.