[Citadel Development] update?

[bennabiy]

If you have a chunk of time, I can do an interactive patch and test. I think
we are getting somewhere, but I am not getting the expected results yet.