Finalize Invoice

I should probably stop pushing to master