Big(ish) commit. thank Mr. Skeltal