Add todos and structure for production