First pass at incorporating extension actions