tons of comments added, unbelievable changes, project 2.0