I meant just moving it into that file as that's where the bottle class lives.