Jhbate/add metrics

@nicolashery @kentquirk works in both demo and production modes