Finished up that new feature!

Did all that stuff you asked, feature is finished, merging the updates!