Merge pull request #58 from chipdude/master

second try at sync and metrics remodeling