[WIP] working on #14

start working on #14 :D 
![screen shot 2014-09-02 at 6 47 26 am](https://cloud.githubusercontent.com/assets/459648/4112629/a629ecd4-3233-11e4-88d4-7309102af95b.png)