The Non-Linear Collapse of Halos