Most of what's below is just moving stuff around - moved the CFME specific stuff to the bottom.