code blocks
final review
nav trouble merge
final fix hopefully