Started refactoring into subject objects