Converted to new style format, still need to fix knitr spacing issue!