Updated Timed data to add redundancy and also refactored a bit. ("Demo" didn't make sense to me, it's going to always be there.)