Many changes

About to add calculation code after gathering rocket data