refactor into stugist objects