Homework 03 with some stretch goals
Stretch goals added