Things are actually working as expected at this stage - some tidying up and support for retaining viewModels
Some tidying up - removed console.logs..