[WIP] @orta => Addresses sync performance issues

Fixes #173.

Tests currently broken – fixing now, but know if this addresses the performance issues would help. 
API diff should probably not affect us, but sometime I got compiler errors with intValue vs integerValue, so presuming it compiles maybe that changed