WARNING! This commit causes heap corruption! But we are getting there...