Refactored a bunch to fix the inconsistencies in the units used.