OhShi 4.1 rebuild

Works to the best of my knowledge, i've thoroughly tested