almost done just gotta fix date