Final (hopefully) 1000 line acceptance test commit