More work, might need to revert some