Reintroduced class file that was left out of last commit.
Added a couple of values missing from net values template.
Bit of cleaning