Add steps 16,17 and 18/20

Add steps 16,17 and 18/20

Contact: joaquin@isla.io