Moved to use proper Selenium wait times (to varying degrees of success...)