Temp check in... code folding not working yet, but some code has been put in place to support it.