Finished Chapter 6, inc. exercises, changed regex