reviewing work.

was there any custom work done for this before this commit ? 
0b69bdcd40d93d9b87b729a978974b1cc2a77b35

if none, that means, all of the work can be reviewed in this PR.

That's one want to look at things

@vincepii maybe if I have questions you could answer them ? 

thanks