Still working with the bundler
Reorder stuff