Fixed EVERYTHING and did Aaron's Job