Added implementation for feature E.
Finished feature E.
Merge branch 'featureE'