Hold merge for Pianostaff no 2, some restructure needed