I was away for some weeks and came back and so much uncommitted stuff
Merged some class and augmention outline