I've been working on an alternative solution that is in my fold branch if you would like to take a look. There are just a couple problems with ODE tests right now.