Also add waitForVisibleById and by tag name and all that good stuff.