Work on interface

Forgot to switch branches