First go at liner integration, needs testing