More work finalizing all our ways of getting a line