Get closer to the CF way of doing things.