Added tons, hopefully I did it right