combines most lines, still errors
combines most lines, still errors