Almost done

Really nice hp/ci from that build:thumbsup: