Moving to new Interface logic

See subject!