started with fixing Timestamp, need to pull from git
merged