Lots of changes, closing in on finishing section 2