major interface rehaul - again