More match

tests pass!
![screen shot 2014-06-20 at 5 07 01 pm](https://cloud.githubusercontent.com/assets/6140131/3347216/013564e0-f8d8-11e3-918f-7bcb61d0fbe8.png)