Finished this new feature

please review