Adding more fields

Adding more fields - still not complete. Also some unused code in prep
for later changes