Initial merge into Ryan's Layout
Typo
final push of the evening