Still stuck unless we want to get Vlad involved