reverted to james last commit and then added in all my changes from the last few commits.