Wip/interfaces2