fixed compile errors, but still needs to bring the concept of ranged tombstones
Merged friendly message commit