Finished project

Removed secondary fields for current date, got calculations working and
outputting.