Trying to revert to pre-Model View Code