Initial Set Up

More update