Still resolving fuck up