Switch functions order
Add TODOs