Near-final changes on my classes, integrated instrument into song