Moved Code to sit better for cloning