TODOs and methods added