Major refactor, working physics, not working particles