Add bundle and first "working" prototype