Started integrating APE (Part 1)