Start on AHS object de-indexing
Deindexed AHS compiles, needs testing