Please pull refactor for 1.0 prep