Partially fix parsing for current generation instances

I've managed to figure out how to partially fix the parsing for current generation instances.

It doesn't fix all the tests; or pull all the data.

But it is at least something, and will hopefully be helpful.

It gives this:

![image](https://cloud.githubusercontent.com/assets/227505/2787885/417b11e4-cb92-11e3-9570-c2892c029b3a.png)