Edits from Mallar and Jan upto the methods section with a number of TODOs left