Refactor + work more on GA