Quite a few changes here, hopefully they work!
Leave gitlab in place for a bit in case I need to get at data