Tidied up repo and added latest code