MAJOR changes, also removed docs