Add expire to upcoming
Move expire to status
add current user initializers'