defs almost done to bundle