Merge in changes to allow for weights on hosts.