making shit editable
moving it all together