Added stuff from last assignment