removed interfaces; they were in the way. Having problems with cyclical
dependencies...