Implemented Timestamps and some other things