Integrated Andrews parts into my most up to date