Something

I did something, please take a look and review. If you like it, merge it. 
If this is a comment, please start it with "#"