wip with slides
wip with more changes
moved stuff around
deletes, notes
more changes