most solid lines so far

but not quite complete.