Update TODO
Move MultiHydra to its own file
Fix most tests