Shuffled things around

look at past commit  for more info