That's a great idea. That said, we might want to accept this and add that as a TODO since it's a bit more work to refactor both the Kane and Lagrange classes.