[Citadel Development] (no subject)

[winzlo]

In my external perspective of looking forward, I would vote #2.  Give the
most control with the least reliance on legacy code.