Added some of Linders stuff in

I’m pretty happy with what’s here now.