FINISHED. Fixed html issues and syntax. Finished writing tests.
Corrected calculations.