added, deleted, and moved stuff around