First pass at #79