Added check for new wait time
Refactored logic into services
Collapsed services into one factory