Mode Maintenance

work in progress