finished adding in stuff