analytics added, closes #7