Implemented required TODO sections as part of Lab2