Started to refactor Guest