Add Aligned class (please ignore confusion on previous 2 commits)