Began cleaning code, began v3