started rates implementation
Merge commit '4ff449dbc23238d6c0d03f2237a4affa261c0e2a'