Copying more over from old project