Finished rescripting

Finished revising. Everything can be used in conjunction with each
other. To do: VAT excl. and incl.