Can now read straight from text files!
Cleaned up data and input mechanism