Gabes feature

I finished the feature that I worked on.