[WIP] Interface adjustenments