CLEANUP: Put method definitions below the class defintion.
Fixes for new AC/AM errors.