MASSIVE UPDATE

almost done