Hw4: Added All Features

Added all the stuff homework #4 had us do.