Fix imports and switch to a List rather than ArrayList
Merge branch 'pa-features' into stage