General: Added all of the code