Converted some, reverted some, borked