Added content and had to move some stuff