Still have to work on resampling
Merge branch 'fann' of https://github.com/rockybulwinkle/moo-cow into fann