Resolved and hence closed.

I also have codes, for anybody who wants one.