submitting before bed

I did a slew of changes, mainly to test my code and come to find out my
timeConvert() isn’t working as expected (Normally would use a case but
we haven’t delved into that yet, trying to stick with scope).

Sleeping and will complete tomorrow.