TONS of changes... too many to remember... need to update more frequently :(