Started moving towards DDD