Adding solutions for #16 & #17. Skipping #15 for now.