Finished work on bundle generation