Some updates for Part 2...will have to do more later as time permits