Actually added 18 this time + added solutions up to 21.