Huge update, adding in everything