cleaning up code, preparing for two-way sync
Implemented two-way sync