UNO: Made an executive decision to break the two interfaces apart.