Added WaitListHandler logic, code refactoring/beautifications.