initial synchronization, still needs some work
initial file synchronization merged with brian's code
merged with latest Aloca code