Completed Week 3 Work

Finished required elements, and some bonus work.