Trying new ablation code
add const for C to K conversion
Update version, more work on new ablation model
Handle merge conflict between this and NathanKell/master