A half tired commit, if this one doesnt work i give up for the night