Adding in ability to wait
Adding test