Initial work

Not dealing with timeout