word wrap works in both cases
workers should be doing most of the work
merging calvins changes
started nav fixes
resolved conflicts
add joels changes