-- adding a few more TODOs to the project