organizing code, writing TODOs