tidy
tidy
refactor remote scuttlebutt stuff into singe file