Updates to piano package. Still a work in progress
merge