moving things to a more editable place