finally finished reverting the destiny rewrite that didnt work.
code will compile, and everything works as before.