Adding stuff back in...

Pretty hectic. Let’s see if I can commit with no conflicts…
adding stuff back in...

Hope this works