Minor changes
created TODOs for each required command as well as created handlers