Adding lots of stuff

no point in detailing it when everything is moving around so much.