Rates Builder WIP