Done some more work, partial data loading is now implemented.