I managed to wrap up both parts of that, we just need Saidors input