First draft of bundle code.