Hw3: Added All Features

This added what homework 3 had us do.