Added some more desired future features for this application.