Think I managed to actually add everything I needed to