Moved wait clause to Walker class and added comments for further development