Rework Interface logic

Signed-off-by: PipelinerArd <kristoferard@gmail.com>