Time In: rewrote/cleaned up scripts