Alignment
Refactored, working.