think everything up to 3b is done (waiting on Piazza to clarify cliff risking and noise stuff for 3a and 3b though)