Merge near completion

still have to put models and materials into the correct folders etc and
load specific model textures