Mark buffer position instead of range.
Work in progress...