adding to and testing bits
moving stuff around