Final commit before attempting to remove the almight x0