Fixed da address storage bug

I know this is well past the deadline but I got some sleep and decided
to check what I submitted… and I gasped when looking at some of the
code. So I spent a few more hours fixing. But now it actually works,
woo!