Major overhaul to interface