Corrected method skeleton, added TODOs