More fiddling around to get a few more pieces in.