sprint 30 draft

@njx @adrocknaphobia