begin refactoring into classes