Liner

Merge Liner implementation