Moved more old code over