morduun #1 I'd say allow includes -- it's bloody tough to work in just one file. Aside from that it sounds good.