JAL-845 @mungoc TODO comments - addAlignment needs a bit more thought