Aligner refactoring now works!!!!!