Add in supervisors. Factor out lease computation into a separate module.