Finished work on 5/11-13 and merging into gh-pages