James stiehl

added most changes from google doc from today.