Revert "Revert "Added Features and Edited Code""

This reverts commit 2bf3dec63086b43cb0b19fcf11980f9e30bb7d6f.