Changing components
New sync system working!
Merge branch 'core'
Merge branch 'master' into josh_network_manager