added some clarifying comments and TODOs. also moves delegator to rules package (makes more sense)