Made ore stuff better, time to do #87