Refactoring rating by bottle. Intermediate commit for iPhone testing.