Shuffling around and comment additions