This whole class needs reformatted with two-space indent.