Templates from the homework with some of the changes

Signed-off-by: Matt <hurleydrum.swim@gmail.com>