Reruns/branch lms

Thanks. That's why I had the fixme, I knew I'd leave one of these