Added Stuff from School