Finished implementing New Feature Requests