final move to code based views