Moved some stuff and added a part