Some interface work
Some work on interface/skeleton