Fixed Everything again because of a missed pull. 5:50am god I am going to be tired.