More of the data-driven-development style.
Remove source of error?