Better names and adding TODOs