Lots more work on getting everything syncing and setup

Should be much closer to complete now.