oceanhackweek · abkfenris · Aug 2, 2022 · Jul 20, 2022 · Jul 20, 2022 · Aug 2, 2022
diff --git a/index.md b/index.md
@@ -144,8 +144,7 @@ Virtual event: We expect to hold formal sessions in at least two time zones, USA
 :hidden:
 
 about/index.md
-about/pasthackweeks.md
+% about/pasthackweeks.md
 OceanHackWeek 2022 <ohw22/index.md>
-% resources/index.md
 % posts
 ```
diff --git a/ohw22/index.md b/ohw22/index.md
@@ -94,8 +94,25 @@ In coordination with the OHW Northwest satellite event, there will be a **[3-wee
 :caption: OceanHackWeek 2022 (OHW22)
 :hidden:
 
-Information for Applicants <applicants>
+schedule
 Global Virtual Event <global/index>
 Regional Satellite Events <satellites>
 Organizers <organizers>
 ```
+
+```{toctree}
+:maxdepth: 2
+:caption: OHW22 Resources
+:hidden:
+
+Logistics <../resources/logistics/index>
+Preparation <../resources/prep/index>
+Tutorials <../resources/tutorials/getting_started>
+Projects <../resources/projects/index>
+```
+
+```{toctree}
+:caption: OHW22 Other information
+
+Information for Applicants <applicants>
+```
diff --git a/ohw22/maine/index.md b/ohw22/maine/index.md
@@ -3,6 +3,16 @@
 This year we are having two parallel East Coast events in Maine.
 One event will be held at Bigelow Labs in Boothbay, and the other at the Gulf of Maine Research Institute in Portland
 
+## Schedule
+
+For most days, plan that we will be meeting from 10 - 5, though we will get started after lunch on Monday, to allow folks time to make their way to Portland or Boothbay and get settled in.
+
+On Wednesday, the GMRI folks will make their way up to Bigelow, so that we can hack as a full group together, explore another lab, have a cookout, and maybe go for a hike.
+
+<iframe width=700 height=850 src="https://docs.google.com/spreadsheets/d/e/2PACX-1vQSK-BFmCaqDp04f6Kfc1tWNIHFDaxHclqe-2Rb4vNlt0we2bqXednUJ_Zk2sRoeqd5nxqsEvJHjYfm/pubhtml?gid=806137536&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
+
+For full details of tutorials and events, see the [global schedule](../schedule.md).
+
 ## Location
 
 Gulf of Maine Research Institute, Portland, ME and/or Bigelow Laboratory for Ocean Sciences, East Boothbay, ME

diff --git a/resources/schedule.md → ohw22/schedule.md b/resources/schedule.md → ohw22/schedule.md
@@ -1,18 +1,123 @@
 # Schedule
 
-OceanHackWeek 2021 will take place August 3-6. *Pre-hackweek OPTIONAL sessions* will be on July 29-30 as a 1-hour session each day ([see below for details](#pre-hackweek-optional-check-ins)).
+:::{admonition} Updates in progress
+:class: warning
 
+The schedules are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
+
+:::
+
+OceanHackWeek 2022 will take place August 15-19.
+
+With a global virtual event and many satellites, this schedule is still very much under development. The global virtual event will be meeting from 11-2 Pacific, and most satellites are planning at least part of their day around that time block to encourage cross-satellite interaction.
+
+## Overview of the global event
+
+<iframe width=600 height=600 src="https://docs.google.com/spreadsheets/d/e/2PACX-1vQSK-BFmCaqDp04f6Kfc1tWNIHFDaxHclqe-2Rb4vNlt0we2bqXednUJ_Zk2sRoeqd5nxqsEvJHjYfm/pubhtml?gid=0&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
+
+## Satellite events
+
+For satellite event schedules, please check out their individual pages to see how each satellite will work with the global event.
+
+- [US Northeast](./maine/index.md)
+- [US Northwest](./seattle/index.md)
+- [US Southwest](./san-diego/index.md)
+- [Australia](./australia/index.md)
+- [Brazil](./brazil/index.md)
+- [OHW-Español](./espanol/index.md)
+
+## Global schedule Details
+
+### Monday
+
+#### Introduction + Code of Conduct - _11:00 - 11:30_
+
+#### Break - _11:00 - 11:30_
+
+#### Xarray - _11:45 - 13:00_ 
+
+_Depak Cherian_
+
+#### Break - _13:00 - 13:15_
+
+#### Project Brainstorming - _13:15 - 14:00_
+
+### Tuesday
+
+#### Satellite report out - _11:00 - 11:15_
+
+#### Break - _11:15 - 11:30_
+
+#### Dask - _11:30 - 12:15_
+
+_Depak Cherian_
+
+#### Break - _12:15 - 12:30_
+
+#### Data access in Python - _12:30 - 13:15_
+
+_Filipe Fernandes_
+
+#### Data access in R - _13:15 - 14:00_
+
+_Ben Tupper_
+
+### Wednesday
+
+#### Project teams report out - _11:00 - 11:15_
+
+#### Data visualization in R - _11:15 - 12:00_
+
+_Ben Tupper_
+
+#### Break - _12:00 - 12:15_
+
+#### Data visualization in Python - _12:15 - 13:00_
+
+_Derya Gumustel_
+
+#### Break - _13:00 - 13:15_
+
+#### Stress in the Geosciences - _13:15 - 14:00_
+
+_Alex Kerney_
+
+### Thursday
+
+#### Machine learning introduction - _11:00 - 11:45_
+
+_Valentina Staneva_
+
+#### Break - _11:45 - 12:00_
+
+#### Machine learning applications - _12:00 - 12:45_
+
+_Filipe Fernandes_
+
+#### Break - _12:45 - 13:00_
+
+#### Best practices for reproducable research - _13:00 - 14:00_
+
+_Nick Record_
+
+### Friday
+
+#### Project wrap up - _11:00 - 12:00_
+
+#### Project presentations - _12:00 - 14:00_
+
+<!-- 
 **In-person participants** will gather for full days, 9am - 5pm EDT. While **virtual participants** may choose to engage primarily with this group and schedule via Zoom and Slack, we strongly encourage you to join the program designed specifically as a virtual event. The virtual event will be split into two schedules and groups based on the distribution of participant time zones, in a 3-hour daily block of formal, live activities. The **larger virtual event** will take place 11:00am - 2:00pm PDT / 18:00 - 21:00 UTC, *except the first day when we will start 30 minutes earlier*. The **“Oceania” virtual event** is intended to accommodate participants from Australia to India and will take place 12:00pm - 3:00pm AEST / 2:00 - 5:00 UTC. You will be asked to choose between the two virtual groups.
 
 Tutorials covering data science topics will be live streamed and viewed at the same time by the in-person and main virtual events, at the times listed in the schedule below under [Main Virtual Event](#main-virtual-event).
 
-**Zoom links** will be posted posted on the `#ohw21-announcements` Slack channel.
+**Zoom links** will be posted posted on the `#ohw21-announcements` Slack channel. -->
 
 <!-- This schedule is also available as a
 [Google Calendar](https://calendar.google.com/calendar/embed?src=c_05tbvgs1f29lrv2s17diuscuhc%40group.calendar.google.com&ctz=America%2FNew_York)
 or [iCal/WebCal](https://calendar.google.com/calendar/ical/c_05tbvgs1f29lrv2s17diuscuhc%40group.calendar.google.com/public/basic.ics)
 subscription. -->
-
+<!-- 
 
 ## Pre-hackweek OPTIONAL check-ins
 
@@ -648,4 +753,4 @@ More detailed schedules are to come.
 <br>
 
 ### Wednesday-Friday (August 4-6) - TBD
-updates coming based on day 1 discussions
+updates coming based on day 1 discussions -->
diff --git a/resources/index.md b/resources/index.md
@@ -1,62 +1,22 @@
 # Resources
 
-Welcome to [OceanHackWeek](about/index.md) 2021 (OHW21)! OHW21 is a 4-day collaborative learning experience taking place August 3-6, 2021, as a hybrid in-person and virtual event. It is aimed at exploring, creating and promoting effective computation and analysis workflows for large and complex oceanographic data. It includes tutorials, data exploration, software development, collaborative projects and community networking. At our [general web site (https://oceanhackweek.github.io)](https://oceanhackweek.github.io) you can read more about OceanHackWeek, including the [OHW21 organizing committee](https://oceanhackweek.github.io/our-team.html) and links to [events from previous years](https://oceanhackweek.github.io/pasthackweeks.html).
+:::{admonition} Updates in progress
+:class: warning
 
-**This site is being actively updated this week (week before OHW21)! Some parts are still out of date, and is the content from last year. We'll keep you posted about updates via Slack. In the meantime, please watch out for references to 2020 ("OHW20") or links that don't work.**
+The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
 
-To make sure that OHW21 will be a welcoming environment for everyone, please read our [Code of Conduct](about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek.
+:::
+
+To make sure that OHW21 will be a welcoming environment for everyone, please read our [Code of Conduct](/about/code-of-conduct.md) carefully as part of your preparation. We expect all participants to adhere to the Code of Conduct in all interactions throughout the hackweek.
 
 ## Schedules
 
-There are three different schedules, corresponding to the **in-person event**, the **main virtual event** and the **Oceania virtual event**. The "Oceania" virtual event is intended to accommodate participants from Australia to India. You will be asked to choose between the two virtual groups. Go to [the Schedule page for details](schedule.md).
+There are a few different schedules and participants may need to pay attention to multiple based on if they are part of the global event, or at a satellite.
+Go to [the Schedule page for details](schedule.md).
 
 ## Preparation
 
-We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. **On July 29 and 30, we will offer short "pre-hackweek" optional sessions to answer questions on the basics of Git, GitHub, Jupyter and core R and Python scientific libraries, and OceanHackWeek in general. The schedule is available in the [Schedule page](schedule.md#pre-hackweek-optional-check-ins), and the Zoom link will be sent via Slack.**
-
-We will use Slack, Zoom and GitHub as our primary communication and content delivery platforms. The week before OceanHackWeek you will receive via email an invitation to join the OceanHackWeek GitHub organization, [https://github.com/oceanhackweek/](https://github.com/oceanhackweek/).
-
-```{toctree}
-:maxdepth: 2
-:hidden:
-:caption: Logistics
-
-logistics/overview
-logistics/getting_help
-logistics/coffeebreaks
-```
-
-```{toctree}
-:hidden:
-:caption: Preperation
-
-prep/git
-prep/github
-prep/jupyterhub
-prep/conda
-
-```
-
-```{toctree}
-:hidden:
-:caption: Tutorials
-
-tutorials/getting_started
-
-```
-
-```{toctree}
-:hidden:
-:caption: Projects
-
-projects/overview
-projects/steps
-
-```
-
-```{toctree}
-:hidden:
-:caption: Website
+We will use a [JupyterHub](https://jupyter.org/hub)-based online environment for all OceanHackWeek computational activities, including tutorials; this environment supports both Python and R. You will need a robust internet connection and a capable laptop or desktop computer. 
+<!-- **On July 29 and 30, we will offer short "pre-hackweek" optional sessions to answer questions on the basics of Git, GitHub, Jupyter and core R and Python scientific libraries, and OceanHackWeek in general. The schedule is available in the [Schedule page](schedule.md#pre-hackweek-optional-check-ins), and the Zoom link will be sent via Slack.** -->
 
-website/updates
-```
+We will use Slack, Zoom and GitHub as our primary communication and content delivery platforms. The week before OceanHackWeek you will receive via email an invitation to join the OceanHackWeek GitHub organization, [https://github.com/oceanhackweek/](https://github.com/oceanhackweek/) if you have not received it already, along with Slack invites and Zoom connection info.
diff --git a/resources/logistics/getting_help.md b/resources/logistics/getting_help.md
@@ -1,24 +1,44 @@
 # Getting Help
 
+:::{admonition} Updates in progress
+:class: warning
+
+The resources are actively being updated! Some parts are still out of date, and is the content from last year. In the meantime, please watch out for references to 2021 ("OHW21") or links that don't work.
+
+:::
+
 We know how overwhelming all of this information can be. Here is some for asking questions and figuring out where to turn for help.
 
-You can ask anything on the Slack `#ohw21-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers.
+You can ask anything on the Slack `#ohw22-general` channel, any time. Organizers and helpers are monitoring this channel, and some of your fellow hackweek participants may be able to help you! Also, feel free to send a direct message on Slack to any of the organizers or helpers.
 
 ## Helpdesk
 
-We've set up the `#ohw21-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly.
+We've set up the `#ohw22-helpdesk` Slack channel to ask technical questions (or other types of questions, if you'd like). 
+
+We will set up some helpdesk Slack user group that you can use to tag your question as, say, about Python. We'll list and describe those groups here. If you know the rough category of help that you may need, please tag one of the helpdesk user groups to get their attention. All help usergroups can be found by typing `@help-` and Slack will prompt with options.
+
+You are also welcome to direct message the helpers if you don't feel comfortable asking questions publicly.
+
+### Slack help groups
+
+- `@help-infrastructure` - For issues regarding the JupyterHub, Slack, Github, and Zoom.
+- `@help-projects` - For help with managing projects, for instance asking how to set up a new repo, or organize meetings.
+- `@help-python` - Questions about Python programming.
+- `@help-r` - Questions about R programming.
+- `@help-tutorials` - For help with tutorial logistics, like cloning the notebooks.
+- `@help-website` - If there are any issues with the website tag us to take a look.
 
 ## During tutorials
 
-- Ask questions on Slack! Use the `#ohw21-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials
+- Ask questions on Slack! Use the `#ohw22-tutorials` channel to ask questions or check out answers to questions others have posed. We will use this same channel every day. Several of us will be monitoring this channel and addressing your questions throughout the tutorials
 - **Vote up** questions from others to help the moderators prioritize which questions to ask the speaker during tutorials.
 - Tutorial moderators will mark questions that are best answered by the instructor and ask helpers (and anyone else!) to answer the rest in real time. Then when the instructor ask if there are questions the moderators will read those reserved for the instructor.
 - Zoom Chat will **not** be available. Ask on Slack!
 - You will be muted at the start of the tutorial presentation. The moderator will review questions on Slack and ask the questions to the instructor during Q&A time.
 
 ## Projects
 
-See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw21_project` channel, too.
+See the [Projects Getting Started page](../projects/steps.md). Feel free to post a question on the `#ohw22_project` channel, too.
 
 ## Reporting a Code of Conduct violation
 

diff --git a/resources/logistics/index.md b/resources/logistics/index.md
@@ -0,0 +1,42 @@
+# Logistics Overview
+
+Some of you will participate in person at various satellite events, and others will participate virtually from time zones all over the world. As we have learned throughout the pandemic, each of these gathering styles has strengths and weaknesses. We are committed to providing an engaging and full experience for everyone and will strive to facilitate cross communication and collaboration across all participants.
+
+## Time
+
+OceanHackWeek 2021 will take place August 15-19.
+
+**In-person participants** will gather as for times as directed by the satellite organizers. While **virtual participants** may choose to engage primarily with this group and schedule via Zoom and Slack, we strongly encourage you to join the program designed specifically as a virtual event. The virtual event will be split into two schedules and groups based on the distribution of participant time zones, in a 3-hour daily block of formal, live activities. The **larger virtual event** will take place 11:00am - 2:00pm PDT / 18:00 - 21:00 UTC.
+
+Detailed schedules are available [Schedule page](../schedule.md).
+
+## Channel of communication: Slack
+
+We will use the [OceanHackWeek Slack workspace](http://oceanhackweek.slack.com/) as the main channel of communication before, during, and after the hackweek. You should have received an invitation to join this workspace. If you haven't seen it in your inbox, check your spam folder, or email us at *oceanhkw@uw.edu*.
+
+[Go directly from a channel or direct message chat into a voice or video chat](https://slack.com/help/articles/216771908-Make-calls-in-Slack), with screen-sharing capability. This will be particularly useful during hack project time.
+
+## OHW JupyterHub ("The Hub") and GitHub
+
+- OHW JupyterHub ("The Hub"): [https://ohw.pilot.2i2c.cloud](https://ohw.pilot.2i2c.cloud)
+- OHW GitHub organization: [https://github.com/oceanhackweek](https://github.com/oceanhackweek)
+
+## Tutorials broadcasting
+
+We will use Zoom to broadcast all tutorials. The Zoom link will be distributed via Slack.
+
+## Hack projects
+
+See [Project overview](../projects/overview.md) and [Hacking at OHW21](../projects/steps.md) for more info.
+
+## Getting Help
+
+See the [Getting Help page](getting_help.md) for guidance and links to have your questions answered or connect with organizers with concerns.
+
+```{toctree}
+:hidden:
+
+Overview <./overview>
+Getting Help <getting_help>
+```
+