Port old score PR line by line

closes #150