[WIP] Fix ref counting

targets #479
Please don't use `//!<` here, but `//`