More work on aligning text
Merging