Closes #84

Total time for new header 2hrs