Lots of updates! Added bodies and a universe
merge