Move some comments around
More commenting