Moving everything to bottle and cleaning up some of the previous mess I made.