Moved Stuff Around and added some descriptions