Timestamps should be working fine now. Just need to do some formatting