Week two part one

Finished. The first portion of this week's work.