Unfinished changes. Added Todo to track next steps.