Added the shim eggs to develop
Merged previous commits