Redoing the whole thing for final project