Added a bunch ae stuff