add todo about organization