Data file complete, now to test on live system.
Data class tested and working.