2/21 still working on todo