Starting work on invoicing functionality