More structure and some filereading