Initial usable PointFire commit