A night's worth of work
again...