major changes, testing now