Initial work

You should wait for close to complete here.