First version of metrics done