Tidied template + added initial code