Interface Changes

Stuff from over weekend