Starting to add classes and interfaces