Big name refactors. Mostly have SetThrust working. Broken state