Refactor code and lay the foundations for the combat