More work on loading, basic setup ready for a test run