More WIP
Revert part of "Saros session 2"
Merge remote-tracking branch 'connor/Saros' into Saros