Working towards getting a version that reads things in a little better