Castle review!

[valancy_s]

We're making a real push at RE to review Castle more consistently. So far, so good...