Some interface changes

Start working on 3 part