Initial Refactor for v1.0