loads of changes. new templates, removed things we dont need