Finished resolve #1, resolve #2. Big milestones.