Simple wait functionality

Lets keep it simple, it works.