committing so I can merge
trying to get my stuff to merge/work
Working on load from history, updated header