Reorganizing code so we move forward properly