More work on interface
Fixed some scoping issues in interface