Feature 21 invoicing

I was off master for *way* too long here. Consider it a learning point. Erm.