Afdp 41

Implementation of AFDP-41. Review and comment away!