Major changes to interface -- not ready for review