Fixing timestamp
Adding TimeCard model to simplify moving the data around.
Using TimeCard model and fixing list so that it shows correct data.
Reformatting code NO CODE CHANGES