cleaned up 16, and added some work on 17. The main parsing algorithm for 17 still needs to be done.