Started Work on mark2, made some slight changes to mark1