updated models and templates for the spot journey - just update left to fix at this stage