Issue/13

fixes #13 
I thought we had decided to move selected_universe out of main as well?