V2 of what i've done

Hope this works.