more moving stuff around whoo