Added preliminary output and tests