Finalized milestone_10 (thank GOD!)