Commenting some large methods and getting things moving