Sprint 32 first draft

@njx @adrocknaphobia @peterflynn