Beginnings of classes

Started work in refactoring code to classes.