moving stuff around, stubbing out PRE code