Added lots of stuff from Syncany