TONS of changes, stuff is working well together still has a ways to go