added date elapsing, finishing up what I can