Finished oo refactor. Added new format to invoice