did some redesigns - necessary for piano refactoring