My topic branch

I'd like to merge in my awesome new feature I built.