todo should work now