unfinished changes to rhythm enterer
merged main
fixing merging