Starting to distinguish between lines and joins

See title