Arpeggio stuff refactoring beginning