Beginning work on interface first draft, minor refactoring