Please review branch feature/rateoptions