issue 1 solution
more todo comments
fix conflicts