Fixed synchronization issues between sides

Seems to work, but this logic is simply awful. Problems very possible
Merge branch 'master' of github.com:kipr/kiss