Think I have finished everuthing