APCs and Canisters

Canisters got overwritten by bay fix, and APC been modified from the old version from my new understanding of DM language.