Status

Resolved #1, partial #2 #3