Moved movement sim to end with wip note.