Almost ready, might need to add a comment of the stats needed
Authored by: belzunce 2017-11-15
Parent: [r644]
Child: [r646]
