More work

Actually put the right one in now. Starting to make a few updates