Added some bundle code, removed demo bundle