Initial version with TODOs