Pre-refactoring working version

This is a version of AMA with which 3D motion ideal observer project works. Major refactoring will follow.