shoe local an remote machines
merged todo