More work on loading things and stuff