Refactor/cleanup/new interface/slash