Broken, free mem wont work, reverting to previous commit