Added cooments
Added wait for file to be ready
Move added
Working!