Review comments addressed, part 1
WIP new interfaces