Bringing SugarLab up to date with the various work that has occurred over... maybe a year. Do not hate me, future self. It is bad enough as it is.