Addition Fixes, TEMP Broken
Coded to change to use Andrino time