Work on using server time
More robust time display