Better clean up
Set up initial sim ochestration structure