Redoing whole project
added things