Analytics and improvement

Under construction...