Final input updates for v1 TODO clean up and get runsimulaiton.py too work again