merging in loader and such

merging in the stuff we worked on last night