Added TODOs and added more license headers