[WIP] @orta => Addresses sync performance issues

Fixes #173.

Tests currently broken – fixing now, but know if this addresses the performance issues would help. 
I did compile it – seemed to work. The compiler error was that "the API `integerValue` has changed to `int`."