Update 4

I did a little of the bottles file, a lot more still needs to be done.