Added neo-riemannian functionality, but it's hack-y