Feature/ahowitt/interface