Tracking non-billable expenses per customer and/or invoice?

Not jet but its #2 on the roadmap