Jl3yr branch

I hope I did this right...