Both interfaces now fully functional