more work on the loader (currently broken)