Finally putting everything where it should be