Add a TODO
Show execution times
Use new paths
Minor optimizations