Forgot to split up homework into multiple commits, oops...