Add include.
Hand modify appinfo.
Tidy.
Remove some v1 stuff.
First pass at v2 implementation.
Update ignores.
Remove old version.
Fixing.
Fix compile errors.