Add scaffold from @rin