6th commit: Matt Suenkens

all functions required of me: seems to work well