Add remaining work from cs410