Big refactor for 2.0