Working on invoice creation