Seperate data and file functionality
Make some room in type numbering scheme
Null values
Remove duplicated code
More realistic test data
Move time types from Values to Data
Remove unused functions