Add development mode
Add TODOs