Started to refactor setup