Added grace period and meetup system