merge in aptc and csr

Initial commit of APTC/CSR work