major refactor done. just need to add rg simulation results