Add junk that accumlated working on athena

Need to clean and organize this before merging back to master.