First commit of refactoring to use pbalign