Working on v3, including some decorators
Working on v3 model