Initial implementation of rate drop completed

Initial implementation of #5