apf initial work commit1