moved stuff around + ideas