Fix/nodowncast2

In progress, for those who want to follow along.

Closes: #330