Updated to manifest version 2

There is probably much more that has to be done with this. I'm not sure, but it's a starting point, at least.