Almost done the straight bits