Drop tax methods and switch to using price as a method (rather than a db var) and re-arrange cms fields and tabs
Add tax rate to products and add ability to define more than one tax rate in settings