commented lots, but going to have major merge conflicts here....
commented averaging filter and merged comment conflicts against jeremy