Made a couple of WIP additions