Add support for the bundle format
Upgrade to the newest version
Change to parameterized class so that we can change more params
Increase timeout... internet slow today