Added todo stateprovider and ctrl