Latest round of updates for Onix comparison.
Includes templates and dependancies.
Working but templates need fleshing out for none generic types.