Made progress
All bomb tests pass