Refs #17 - Alignment