Add TODO statements for remaining work