Added "TODO" where ever we need to fill in functions