Feature/feature 88

This is the complete feature 88 code