Commiting some WIP on PCA before merge to master