From what I understand, the ATT will not be going away, it may just be mererly taking the form of a condition attached to a license- but I am not sure, maybe someone else has some comments regarding this? I believe the law is set up this way already;
3. An authorization to transport that takes the form of
a condition attached to a licence must
(a) identify all of the firearms to which the authorization
to transport applies; and
(b) specify
(i) the period for which the authorization to transport
is issued,
(ii) the places between which the firearms to which
it applies may be transported, and
(iii) the reasons for which the firearms may be
transported between the specified places.